From 550796d897380d64675373d763275d69eefbcad1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Javier=20Jard=C3=B3n?= Date: Fri, 30 Oct 2009 04:47:19 +0100 Subject: [PATCH] Fix some compilation warnings Use proper gint8 array variable instead a string --- gtk/gtkclist.c | 12 +++++++++--- gtk/gtkctree.c | 8 ++++++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c index 2d0f6bc32f..9117f8c781 100644 --- a/gtk/gtkclist.c +++ b/gtk/gtkclist.c @@ -1925,8 +1925,10 @@ abort_column_resize (GtkCList *clist) if (GTK_CLIST_ADD_MODE(clist)) { + gint8 dashes[] = { 4, 4 }; + gdk_gc_set_line_attributes (clist->xor_gc, 1, GDK_LINE_ON_OFF_DASH, 0,0); - gdk_gc_set_dashes (clist->xor_gc, 0, "\4\4", 2); + gdk_gc_set_dashes (clist->xor_gc, 0, dashes, G_N_ELEMENTS (dashes)); } } @@ -3666,10 +3668,12 @@ toggle_add_mode (GtkCList *clist) gtk_clist_draw_focus (GTK_WIDGET (clist)); if (!GTK_CLIST_ADD_MODE(clist)) { + gint8 dashes[] = { 4, 4 }; + GTK_CLIST_SET_FLAG (clist, CLIST_ADD_MODE); gdk_gc_set_line_attributes (clist->xor_gc, 1, GDK_LINE_ON_OFF_DASH, 0, 0); - gdk_gc_set_dashes (clist->xor_gc, 0, "\4\4", 2); + gdk_gc_set_dashes (clist->xor_gc, 0, dashes, G_N_ELEMENTS (dashes)); } else { @@ -5109,9 +5113,11 @@ gtk_clist_button_release (GtkWidget *widget, if (GTK_CLIST_ADD_MODE(clist)) { + gint8 dashes[] = { 4, 4 }; + gdk_gc_set_line_attributes (clist->xor_gc, 1, GDK_LINE_ON_OFF_DASH, 0, 0); - gdk_gc_set_dashes (clist->xor_gc, 0, "\4\4", 2); + gdk_gc_set_dashes (clist->xor_gc, 0, dashes, G_N_ELEMENTS (dashes)); } width = new_column_width (clist, i, &x); diff --git a/gtk/gtkctree.c b/gtk/gtkctree.c index c3dd938438..a396db543a 100644 --- a/gtk/gtkctree.c +++ b/gtk/gtkctree.c @@ -748,9 +748,11 @@ gtk_ctree_realize (GtkWidget *widget) if (ctree->line_style == GTK_CTREE_LINES_DOTTED) { + gint8 dashes[] = { 1, 1 }; + gdk_gc_set_line_attributes (ctree->lines_gc, 1, GDK_LINE_ON_OFF_DASH, GDK_CAP_BUTT, GDK_JOIN_MITER); - gdk_gc_set_dashes (ctree->lines_gc, 0, "\1\1", 2); + gdk_gc_set_dashes (ctree->lines_gc, 0, dashes, G_N_ELEMENTS (dashes)); } } @@ -5315,6 +5317,8 @@ gtk_ctree_set_line_style (GtkCTree *ctree, if (GTK_WIDGET_REALIZED (ctree)) { + gint8 dashes[] = { 1, 1 }; + switch (line_style) { case GTK_CTREE_LINES_SOLID: @@ -5326,7 +5330,7 @@ gtk_ctree_set_line_style (GtkCTree *ctree, if (GTK_WIDGET_REALIZED (ctree)) gdk_gc_set_line_attributes (ctree->lines_gc, 1, GDK_LINE_ON_OFF_DASH, GDK_CAP_BUTT, GDK_JOIN_MITER); - gdk_gc_set_dashes (ctree->lines_gc, 0, "\1\1", 2); + gdk_gc_set_dashes (ctree->lines_gc, 0, dashes, G_N_ELEMENTS (dashes)); break; case GTK_CTREE_LINES_TABBED: if (GTK_WIDGET_REALIZED (ctree)) -- 2.30.2